Merge branch 'upstream' into 3.09.0
authorSven Luther <luther@debian.org>
Thu, 27 Oct 2005 19:08:40 +0000 (19:08 +0000)
committerSven Luther <luther@debian.org>
Thu, 27 Oct 2005 19:08:40 +0000 (19:08 +0000)
commit1a5ed129162e97afa942b748e0aad67ba8bbae21
treeef03a34e091bfa3d0f29f11e09b83ffb3dc03cb0
parent0117bc2a479a22ea892509c2aff8a1dddfdfd328
parentc253105a9aee92a2a678d3451f31f0fea4c16514
Merge branch 'upstream' into 3.09.0